$OpenBSD: patch-install_sh,v 1.3 2014/09/08 07:33:58 espie Exp $
--- install.sh.orig	Sat Feb  5 08:26:20 2000
+++ install.sh	Mon Sep  8 09:32:21 2014
@@ -50,11 +50,11 @@ XMCD_URL=http://metalab.unc.edu/tkan/xmcd/
 DIRPERM=755
 SCRPERM=755
 FILEPERM=444
-BINPERM=711
-XBINPERM=4711
-OWNER=bin
+BINPERM=555
+XBINPERM=4555
+OWNER=root
 GROUP=bin
-BINOWNER=bin
+BINOWNER=root
 BINGROUP=bin
 XBINOWNER=root
 XBINGROUP=bin
@@ -597,7 +597,7 @@ $ECHO "\n\t$XMCD_URL"
 
 # Check privilege
 (id | fgrep 'uid=0(root)') >/dev/null 2>&1
-if [ $? != 0 ]
+if false
 then
 	$ECHO "\n\nYou should be the super user to install xmcd."
 
@@ -963,80 +963,8 @@ then
 fi
 
 
-# Remove old xmcd components
-
-$ECHO "\n\nChecking for old xmcd components..."
-
-# Old binaries
-dirs=`echo "$OPATH" | $AWK -F: '{ for (i = 1; i <= NF; i++) print $i }'`
-for i in $BINTRYDIRS
-do
-	dirs=`$ECHO "$dirs\n$i"`
-done
-dirs=`($ECHO "$dirs" | \
-       sed -e 's/^[ 	]*//' -e '/^$/d' | \
-       sort | uniq) 2>/dev/null`
-
-if [ -n "$dirs" ]
-then
-	for i in $dirs
-	do
-	    if [ "$i" = "$BINDIR" -o "$i" = "." ]
-	    then
-		    continue
-	    fi
-
-	    for j in xmcd cda cddbcmd wm2xmcd dp2xmcd $STARTUP_SCRIPT
-	    do
-		tryfile=${i}/${j}
-		if [ -f $tryfile -a -x $tryfile ]
-		then
-		    if [ -z "$BATCH" ]
-		    then
-			YNDEF=y
-			if get_yn "Remove old executable $tryfile"
-			then
-			    rm -f $tryfile
-			    if [ $? -ne 0 ]
-			    then
-				$ECHO "Cannot remove $tryfile."
-			    fi
-			fi
-		    else
-			rm -f $tryfile
-		    fi
-		fi
-	    done
-	done
-fi
-
-# Old xmcd app-defaults files
-dirs=`for i in $LIBTRYDIRS $LIBDIR; do echo "$i"; done | sort | uniq`
-for i in $dirs
-do
-	tryfile=${i}/app-defaults/XMcd
-	if [ -f "$tryfile" ]
-	then
-		if [ -z "$BATCH" ]
-		then
-		    YNDEF=y
-		    if get_yn "Remove old xmcd resource file $tryfile"
-		    then
-			rm -f $tryfile
-			if [ $? -ne 0 ]
-			then
-			    $ECHO "Cannot remove ${tryfile}."
-			fi
-		    fi
-		else
-		    rm -f $tryfile
-		fi
-	fi
-done
-
-
 # Set architecture-specific binary directory
-ARCHBIN="${XMCDLIB}/bin-${OS_SYS_T}-${OS_MACH_T}"
+ARCHBIN="$XMCDLIB/../../libexec/xmcd"
 
 
 # Make all necessary directories
